shortcuts label: Redo the keycap theming

Use a style class directly on the frame. This is easier to reuse.

diff --git a/gtk/gtkshortcutlabel.c b/gtk/gtkshortcutlabel.c
index 907761c88be3bfe7619d8f71dcb8a12c234fc6ab..12f14678b715ae00c6fd722963a73bc80ce6c61e 100644 (file)
--- a/gtk/gtkshortcutlabel.c
+++ b/gtk/gtkshortcutlabel.c
@@ -175,6 +175,7 @@ display_shortcut (GtkContainer    *self,
         gtk_container_add (self, dim_label ("+"));
 
       frame = gtk_frame_new (NULL);
+      gtk_style_context_add_class (gtk_widget_get_style_context (frame), "keycap");
       gtk_widget_show (frame);
 
       gtk_container_add (self, frame);

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a39e8fa94bf32e6b004bd06ac892df87be9b8338..45916e67eb599d3a20175c1e65ddd12bb7a93dd6 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3447,7 +3447,7 @@ shortcutswindow .round .button label {
   padding: 0;
 }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 0ef4bd00424b56248e01cd3c03d20acc93ff3500..89e913daae8c2721e71117d4815df03859b96096 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4660,7 +4660,7 @@ shortcutswindow .round .titlebar .button.titlebutton label,
 .titlebar shortcutswindow .round .button.titlebutton label {
   padding: 0; }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1fcd53b9b8567e59b113d49e16a9fc2ed0aafbb9..c47800718faca6d3047adec1f6544b7433c3f672 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4833,7 +4833,7 @@ shortcutswindow .round .titlebar .button.titlebutton label,
 .titlebar shortcutswindow .round .button.titlebutton label {
   padding: 0; }
 
-shortcutswindow GtkShortcutLabel .frame {
+.frame.keycap {
   background-color: #fefefe;
   border: 1px solid #cecece;
   border-radius: 5px;